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

Change-Id: I43ef41ee14d0ba434a5783f9b3daf944f30bd542