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

Change-Id: Ie30cc92247357811f0167ce44054d0f24bd8122a