[automerger skipped] Merge "Mark prebuilt API stubs as java:sdk rather than java:platform" am: 363f835c03 am: b072709aa8  -s ours
am: 3862e0518d  -s ours

Change-Id: Id593043be513e2f29f0833c991638546e77264c9