Android 6.0.1 Release 69 (MMB30Y)
am 4c99836d: am 48257f16: am 31f5e7f4: Merge "Adopting the external update api to update SDK components" into studio-1.3-dev automerge: 22ef8ec automerge: 068e2ee

* commit '4c99836d2f525e236697448cc2f14eb1984b9592':
  Adopting the external update api to update SDK components