Merge "remove linking against aidl enum"