Merge proposals dependent on lp:~dooferlad/linaro-android-build-tools/local_mods

lp:~dooferlad/linaro-android-build-tools/local_mods has no merge proposals.