Merge "Trying to work around aidl incremental build bug."