Merge bea7336c54c05ebe65d8e1aa0327df66e01f4981 on remote branch

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