Merge "Use android.hardware.graphics.common-ndk and composer3-ndk wrappers."