Merge "aidl: Separate aidl logic into its own static library"