Merge "Mark prebuilt API stubs as java:sdk rather than java:platform"