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

Change-Id: I654540abfc3a691b1f2caa0921203e952bbaf53d