Merge "Update the SDK AIDL list" into lmp-dev