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

Change-Id: I0c9d4d2c35b91c0277f7e4a5bda7d479df16460c