Fix lunch choices for git_main am: d319529aed am: 7740cd8acb

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/2811373

Change-Id: Ib4308a33f87acbb2bec944915bbc922d708464f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>