Merge commit '501c5d48' into manualmerge

Conflicts:
	Android.mk

Change-Id: If0a6b6475ac908a22ece23d43d1011f8d20ceb43
tree: b2a0c0a27187eb7ec0cf12b63c7b101b061b39fb
  1. src/
  2. tests/
  3. Android.mk
  4. CleanSpec.mk
  5. README