Merge "Package framework.aidl produced by Soong"