Merge \\"Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968\\" am: 326e55a3e2
am: ce482360b9

Change-Id: I642efaa06e6b21791ba38944eee2078ba452683f