Merge "incremental: Move AIDL file to declared package."