Refactor of AndroidDist and AaptGen

This is the combination of what will be the next iterations of rb 676 and 672. They will go up separately still, 
but really have become two parts of the same change. Making sure that Travis can still pass even without a 
valid Android SDK.