Merge "[incremental] change build rules to not to use aidl_interface" into sc-dev