Merge "Add a Java backend for android.hardware.graphics.common AIDL"