am eb95cfa4: (-s ours) Merge remote-tracking branch \'goog/master\' into HEAD

* commit 'eb95cfa41925d2c286075236688d6473999c954e':
tree: b2a0c0a27187eb7ec0cf12b63c7b101b061b39fb
  1. src/
  2. tests/
  3. Android.mk
  4. CleanSpec.mk
  5. README