am 4f89e3b2: am 1354a1ff: am f715da3d: Merge "Update the SDK AIDL list" into lmp-dev

* commit '4f89e3b215c731a34b3ab8c300539f96e3f22459':
  Update the SDK AIDL list