Merge "Use correct LOCAL_SDK_VERSION" into oc-dev