[automerger skipped] Merge "libvulkan: add a nullptr check for ANativeWindow*" am: 52d84f8f25 am: 9eee7a7f34 am: 54b5e49fd3 am: 275e157c34
am: 00d9db9661 -s ours
am skip reason: change_id Ic8a4baf7e219cc8e1fb3838d4e4b710b242efa9c with SHA1 533cea9f7b is in history

Change-Id: I431d57ae2faddd64651303a98125b95c22e64512