Merge "Revert^2: Hardcode API list of newly hidden intrinsics"
am: 98afa11c3c

Change-Id: I15ecd9d4dec01b7fef173e20b9874d046bf23551