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

Change-Id: I4155b00936a0cfdc7e6c67ec9b7bf617bf884af2