Merge "libvulkan: add a nullptr check for ANativeWindow*" am: 52d84f8f25
am: 9eee7a7f34

Change-Id: Ic9eff713e3f3f3e721f7030941e21d1f055d8320