Merge changes from topic "libcore-remaining-hiddenapi"
am: 74c171b4da

Change-Id: Ib0671d241e276936c123bcb54db55eccc6919cbb