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

* commit '1cca87b3239c3e0af7efd419a022784663779c9d':
  Retire LOCAL_NDK_VERSION (DO NOT MERGE)