Merge "Update API file for libcore additions" am: 07160ff7e5 am: 2d67c19860
am: e8e035aaaa

Change-Id: I7a22c36c3b1f9238cfe89f95b4e0d148030c8dc1