Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c am: 7d09db2830
am: 81368e08e0

Change-Id: Ifa2ca4ef2b9144db318b61cd248000c6e3eb96fe