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

Change-Id: I5bdce324be694615712d872eb95b09bd79176b9c