Merge "Use android.hardware.graphics.common@1.0"