Merge "[incremental] fundamental aidl interfaces"