native: merge upstream into ToT

BUG=b:157855577
TEST=FEATURES=test emerge-betty nnapi aosp-frameworks-ml-nn

Exempt-From-Owner-Approval: Repo is forked from AOSP, we own the fork

Change-Id: I474c4044beed344d6639090e545492b3c01b4bbc