tree 2c7a6da0b462552d70c0eb63ed58bb0c4e81e0bb
parent 9e442bb3019a8926bfbd90e888bb92e468bdec9f
parent 6e60567b9bbf59b38c72493faf7cc9eb6ce43c64
author Haibo Huang <hhb@google.com> 1546984691 -0800
committer Haibo Huang <hhb@google.com> 1547240533 -0800

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

Test: bionic unit tests
Change-Id: I45009cc50332d02bbc977790c7ed7bb18fd67fc6