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

Change-Id: I25c12d26e66cae28e264b60edd5d4803388999b7