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