Merge "Set hidden API flags of intrinsics" into pi-dev
am: c5759ba651

Change-Id: I6379ed1f7e92d42ce285a03d8ca2da9536ac05b5