Merge \\\\"Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a\\\\" am: 18941cb53f am: fbe280e345 am: 8fb315b17b
am: fbf0d8e8e4

Change-Id: Ic3b872f8be97f7fb6dad80c6ffd4fcd4e0205a30