am 15eb032d: (-s ours) DO NOT MERGE ANYWHERE. Update SDK and support lib from build 2085979.

* commit '15eb032dc2b9112381e89363bef7bfb129d4b621':
  DO NOT MERGE ANYWHERE. Update SDK and support lib from build 2085979.