Merge commit 'e88dccd34268a386e44f872dcfcec2533a051b9c' into HEAD

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