Merge ab/5111269 into master
am: 816a8bb037

Change-Id: I2afd0756285435d56a592b122432959b683c566a
tree: 30c4986464e4db6a41e3afce4be5e5d53d3238be
  1. host/
  2. .gitignore
  3. Android.bp