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

Change-Id: I4a74c2421a0a26c5ca92f80e53edbb2487764897