Merge "Remove framework.aidl rules"