Merge "Separate aidl dependencies from compiler dependencies"