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

Change-Id: I7858caa49bad40d0817883b547ced3cc83231abf