Merge commit 'edb4f3367276b44d9fd5040856b7cf98f1b85bf1' into HEAD

Change-Id: Ia71415cd6896a5650f3f73b810b8b5eec7bf3960
tree: b8c87ac44ec67ffb063afcdcbc19d1cfc66aced7
  1. include/
  2. lib/
  3. templates/
  4. tools/
  5. unittests/
  6. Android.bp
  7. LICENSE.TXT
  8. OWNERS