Merge "Remove the aidl tool" into mnc-dr2-dev