Merge aosp/master into gerrit/vulkan-cts-1.0-dev