Merge "Revert "Update hidden API membership of intrinsics"" into pi-dev
am: eba8b96ccb

Change-Id: I78c51495485e92f4ad6617403a802216a00c0146