Merge "Rename and document @IntraCoreApi in com.android"