Merge "Track public android.system API changes in libcore"
am: 1423684d1a

Change-Id: I98319e08a913b8c679579fb52bc4ded61fc5f5b0