Merge "Remove dependency on internal libcore method"
am: c7ae7ca343

Change-Id: Ice43bea3362a2a983f050d199514b485ce00f976