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

Change-Id: Ic11fa8535aa79e6529bf9325b13e1e6c19a6ce04