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

Change-Id: Iedee617ae7384e7de76146060bd142e4b765a2be