Merge proposals dependent on lp://staging/linaro-android-build-tools

lp://staging/linaro-android-build-tools has no merge proposals.