Merge "Track API changes in libcore" am: 63ae028ae0
am: 96211469a6

Change-Id: Ia6739db882bbc585ad7aa142795b59b4cba87fdb