Merge branch 'master' into v2

scripts/installAndroidSDK.sh

 # copy licenses
 echo "Copying Android licenses"
 scriptdir=`dirname $0`
-cp "${scriptdir}"/android-licenses/* "${ANDROID_HOME}"/licenses
+mkdir -p "${ANDROID_HOME}"/licenses
+cp "${scriptdir}"/android-sdk-licenses/* "${ANDROID_HOME}"/licenses