am 6693c5f4: (-s ours) am 03c19cee: (-s ours) update SDK and support lib. DO NOT MERGE ANYWHERE.

* commit '6693c5f4d85103f9b03c894e942856f2e39e1489':
  update SDK and support lib. DO NOT MERGE ANYWHERE.