Merge "Refactor HDMI related AIDL packages"