Merge "Clean up android.hardware.common types"