[automerger skipped] Merge "Fix broken mainline_arm64."
am: 3613193b31
-s ours
Change-Id: I01cfd143440cd16599be67588a6aaac2a9a1e478
This commit is contained in:
am: 3613193b31
-s ours
Change-Id: I01cfd143440cd16599be67588a6aaac2a9a1e478