Merge "DO NOT MERGE - Revert "DO NOT MERGE - Use stable verion aidl module instead of unstable one"" into rvc-dev