Merge "Merge remote-tracking branch 'aosp/refs/heads/upstream-master' into 20181018-merge-vulkan_headers_to_master"