Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

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