Merge "android.hardware.common: support Java"