Merge changes I93cf24d4,I32e438ef

* changes:
  Convert host tools to Android.bp
  Rename aapt_defaults to aapt2_defaults