Linaro Android Build Tools

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

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

lp://staging/~berolinux/linaro-android-build-tools/fix-toolchain-version-dump has no merge proposals.