am 89a54669: (-s ours) am 89391bd3: DO NOT MERGE Update SDK prebuilt from 1183558

* commit '89a546693f43ab1e93f3b640b94e5f21d05f4058':
  DO NOT MERGE Update SDK prebuilt from 1183558