Merge "Do not overwrite hidden access flags for intrinsics" into pi-dev
am: 5b97b01a32

Change-Id: I51d28d811035667fa18baa6c8dbd38eb01610261