Merge "More @CorePlatformApi annotations for libcore"
am: 177f778b59

Change-Id: I2ee528201f52a02c655afd198f0723e9ac4f5a44