[automerger skipped] [DO NOT MERGE] Fix aosp_arm64-eng (checkbuild). am: dae83cfcff -s ours am: 6ae5ca1a67
am: 58ddb07544 -s ours
am skip reason: subject contains skip directive

Change-Id: I3efd30f961af3de7163506984b6a946704f3fd19