Merge "Use ro.product.vendor.device to determine if running on Cuttlefish"