Merge "More @CorePlatformApi annotations for libcore"