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

Change-Id: I81934dfe8a6fac2958f5efe1663bf35c1c35d006