Merge "Move AIDL files to declared packages."