Merge proposals dependent on lp://staging/~gesha/linaro-android-build-tools/fix-return-code

lp://staging/~gesha/linaro-android-build-tools/fix-return-code has no merge proposals.