Merge "Remove Intrin.h from RenderScript prebuilts"
am: 91f202e7b3

Change-Id: Ia278c76c1af287b52035d85be97bd3239214fc1b