am b1b1e303: am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build 1119326"

* commit 'b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9':
  Fix aosp_arm64 mirror-aosp-master build 1119326