Merge "Wrap private-stub-annotations in android.jar"