Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 12ae57fd26

Change-Id: Ib0c9261fe5b64f77efb7a39de414e224371afe90
tree: 063fac19cd923d3ec8065549d175d17b31ce6b28
  1. src/
  2. tests/
  3. Android.mk
  4. CleanSpec.mk
  5. OWNERS
  6. README.txt