Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
am: 9f4ad4fbb6

Change-Id: I18db994066406214705f36f2e10f0d39dcc279df