Merge ab/5111269 into master am: 816a8bb037
am: 6437e802bb

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