Merge commit '181d62aea745f879053166502bec005be62ce8ae' into HEAD

Change-Id: Id969e9b5d7bcf28a0346e95deae2ef9ec41b3477
tree: 72e87abb578c52a73fb90e5078022843321d9899
  1. src/
  2. tests/
  3. Android.mk
  4. build.gradle
  5. COPYRIGHT.txt
  6. impl.html