Merge "USB APEX with AIDL implementation"