diff --git a/docs/android_toolchain.txt b/docs/android_toolchain.txt
index b823e0288c..4771b929be 100644
--- a/docs/android_toolchain.txt
+++ b/docs/android_toolchain.txt
@@ -2,13 +2,14 @@ Windows:
 
 - Unzip NDK
 - Install Cygwin with gnu make and launch it
-$ export NDK_ROOT=C:/path/to/android-ndk-r5c
+$ export NDK_ROOT=C:/path/to/android-ndk-<version>
 $ export NDK_HOST=windows
 $ mkdir omim-android-debug
 $ cd omim-android-debug
 $ /cygdrive/path_to_QtSDK/path_to_Qt/mingw/bin/qmake.exe -r ../omim/omim.pro -spec ../omim/tools/mkspecs/android-g++ CONFIG+=debug
 $ /cygdrive/path_to_QtSDK/mingw/bin/mingw32-make.exe
 
+
 Mac OS X:
 
 - Unzip NDK
@@ -16,6 +17,10 @@ Mac OS X:
 --- Shadow dir omim-android-debug
 --- Override qmake parameters: -spec /path/to/omim/tools/mkspecs/android-g++
 --- Set Environment variables
-    NDK_ROOT=C:/path/to/android-ndk-r5c
+    NDK_ROOT=/path/to/android-ndk-<version>
     NDK_HOST=darwin-x86
-- Enjoy using QtCreator!
\ No newline at end of file
+- Enjoy using QtCreator!
+
+
+!!!!! For any system !!!!!
+- See additional scripts and follow their instructions in <omim>/tools/android
\ No newline at end of file
diff --git a/tools/android/aapt b/tools/android/aapt
index 905cd14a68..1fd2533595 100755
--- a/tools/android/aapt
+++ b/tools/android/aapt
@@ -6,4 +6,4 @@
 # Main purpose is transparently disable compression
 # for given file types inside .zip (.apk) file
 
-/Developer/android-sdk-mac_x86/platform-tools/aapt2 $@ -0 mwm -0 txt -0 bin -0 update -0 skn -0 slf -0 html -0 png -0 ttf
+${0}2 $@ -0 mwm -0 txt -0 bin -0 skn -0 slf -0 html -0 png -0 ttf
diff --git a/tools/android/update_assets.sh b/tools/android/update_assets.sh
index afcd67bac8..f07db7885b 100755
--- a/tools/android/update_assets.sh
+++ b/tools/android/update_assets.sh
@@ -8,11 +8,11 @@ DST=../../android/assets
 rm $DST/*
 
 files=(01_dejavusans.ttf 02_wqy-microhei.ttf 03_jomolhari-id-a3d.ttf 04_padauk.ttf \
-       05_khmeros.ttf 06_code2000.ttf World.mwm about-travelguide-iphone.html \
-       basic.skn basic_highres.skn categories.txt classificator.txt countries.txt \
+       05_khmeros.ttf 06_code2000.ttf World.mwm WorldCoasts.mwm about-travelguide-iphone.html \
+       basic.skn basic_highres.skn categories.txt classificator.txt types.txt countries.txt \
        drawing_rules.bin fonts_blacklist.txt fonts_whitelist.txt languages.txt \
        maps.update symbols_24.png symbols_48.png unicode_blocks.txt visibility.txt \
-       types.txt )
+       )
 
 for item in ${files[*]}
 do