Merge proposals dependent on lp://staging/~notnownikki/jenkins-launchpad-plugin/android-multiple-target-fixes

1. android-multiple-target-fixes
2. Dependent merge proposals