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

Change-Id: Idb2aa547fe5fc88de43daca0d8804a8605d2945c