Merge "Allow redefined intrinsics"
am: 5c19b373ae

Change-Id: Ida2467cc6a7e30883a3cba43bd528b61d998b3a2