Merge "Update to use LOCAL_STATIC_ANDROID_LIBRARIES" into oc-dev