[automerger skipped] Merge "Update VNDK version for common graphics HALs." am:...

[automerger skipped] Merge "Update VNDK version for common graphics HALs." am: 611f7f5c am: 3803cbc8 -s ours am: 2210cef2 -s ours

am skip reason: Change-Id I18495d303ae8bd68f35631b2be2dc9dcf915e991 with SHA-1 be4cdda3 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1464825

Change-Id: Id3a48b9bde85951e856094a7f6d8ff5c02cbaf9c