Merge remote-tracking branch 'aosp/upstream-master' into arm-optimized-routines
am: 4ced35fcfc

Change-Id: I6cf5800c4dff67b7049071a0190ef93f220fa14c