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

Change-Id: I7e5ca251a6c15ea6f040897a8e5cf4c653f4ddd1