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

Change-Id: I93b2d6742193414b3f6a81cd35e923a4f6b7f2fb