Merge proposals dependent on lp:~mwhudson/linaro-android-build-tools/trunk

lp:~mwhudson/linaro-android-build-tools/trunk has no merge proposals.