Merge "Remove framework.aidl rules" into qt-dev