android-sdk: fix binary paths for tools version 20
android-sdk: add 23 bottle.