Merge proposals dependent on lp://staging/~danilo/linaro-android-build-tools/bug-1088461

lp://staging/~danilo/linaro-android-build-tools/bug-1088461 has no merge proposals.