Merge "Add @CorePlatformApi for customization of Libcore.os by frameworks."
am: 81e308ac9d

Change-Id: I60565d151fdc48426c42fcf1375e34bc4bf1e787