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

* commit '1659906d5e6d59bcf823d6bb781e15846abfda9c':
  Retire LOCAL_NDK_VERSION (DO NOT MERGE)