Merge "Use android.jar from Metalava."
am: e973f6de0f

Change-Id: I6ad90d2a1d87f99932760f41dc61dd5d4ba56be4