Merge "libui: add support for android.hardware.graphics"