Merge \"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\" into stage-aosp-master
am: e1cf90c6eb

Change-Id: Ib300b8d9ca4082abeebe3530c74537969330e1a7