Merge "Wrap private-stub-annotations in android.jar" am: d5814e0760 am: c35a0c7ae3
am: 48243d9414

Change-Id: Id4ff5b93013cb8bc9d7495ea9f389f58de7142b7