Merge proposals dependent on lp:~berolinux/linaro-android-build-tools/fix-toolchain-version-dump

1. fix-toolchain-version-dump
2. Dependent merge proposals