Merge "Revert^2 "hidden_api: Call back into libcore on hidden api detection""" into pi-dev