Merge "Add stl include path if LOCAL_NDK_VERSION is set"