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

Change-Id: I4860b044393936972fb922d02d7fdb1c61925ff7