Merge remote-tracking branch 'aosp/upstream-master' into arm-optimized-routines

Test: bionic unit tests
Change-Id: I45009cc50332d02bbc977790c7ed7bb18fd67fc6