am f49ba834: (-s ours) am 1659906d: (-s ours) Merge "Retire LOCAL_NDK_VERSION (DO NOT MERGE)"

* commit 'f49ba8344b2de51bf1f96ea036248b1fad88627b':
  Retire LOCAL_NDK_VERSION (DO NOT MERGE)