Adopt the new prebuilts/ndk/<number> paths.

Bug: 6932421
Change-Id: Iba7200aacef2201001f92c6ffa020881f0b528ea
diff --git a/core/package.mk b/core/package.mk
index e1b7da3..acb8df4 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -304,7 +304,7 @@
     LOCAL_PACKAGE_NAME=$(LOCAL_PACKAGE_NAME))
 endif
 jni_shared_libraries += \
-    $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r$(LOCAL_NDK_VERSION)/sources/cxx-stl/stlport/libs/$(TARGET_CPU_ABI)/libstlport_shared.so
+    $(HISTORICAL_NDK_VERSIONS_ROOT)/$(LOCAL_NDK_VERSION)/sources/cxx-stl/stlport/libs/$(TARGET_CPU_ABI)/libstlport_shared.so
 endif
 
 # Set the abi directory used by the local JNI shared libraries.