Merge "Enable jdiff for api-stubs-docs"
am: 61d0ec49ef

Change-Id: I0eae62d725ddefa6ef719b8d34eb1ca9eb8a7b41