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

Change-Id: Id4dc90a8d4c3cf5c8231676df6c1db69d56050bd