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

Change-Id: I8765ff3c856df9107ee22e244c56881a25232db3