Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 0bff4a1296

Change-Id: Icdff0ea2225fe1dd8e1b587f829b005810413655
tree: 768e14771154e4ce3f2031fcb02fb603c243efd6
  1. host/
  2. shared/
  3. system/
  4. tests/
  5. Android.mk
  6. common.mk
  7. README