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

Change-Id: I404c9665d23664f137462c246ebc724128035555