Merge changes I3d6f4dd4,I8b538cc8,Id7ba841d * changes: Fix for unhandled sub.w rD, sp, rM, lsl N Fix the build after sync with upstream Merge remote-tracking branch 'aosp/upstream-master' into mymerge