Merge "Merge "Merge "Remove stale FEATURE_VULKAN_HARDWARE_COMPUTE check" into oreo-cts-dev am: 0b96680d3e  -s ours" into oreo-mr1-cts-dev am: 859661a110  -s ours"