Merge "Track libcore commit aaebe4e16c487da7555cd230265acc211389781d." into nyc-dev