Merge \\\\"Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b\\\\" am: cf5b00e6bc am: 43714397df am: b0d49c7cbb
am: dfad391474

Change-Id: I735e9a43690aad689a5ff073bfddaa323dacdfed