Clean up some library and add ANDROID_SDK_DIR path variable