Merge "Package framework.aidl produced by Soong"
am: f504f3a6ba

Change-Id: Ib05d182cb0c90b6705401495b30e2991f9ad1bf5