Merge "light AIDL: use module_current"