Merge proposals dependent on lp://qastaging/~doanac/linaro-android-build-tools/user-build-script

lp://qastaging/~doanac/linaro-android-build-tools/user-build-script has no merge proposals.