[automerger skipped] DO NOT MERGE am: fca7e21b59  -s ours
am: 61f87467e4  -s ours

Change-Id: I33355784086c3b6380e9b6af5c557e94dd5d7969
tree: fb503a1049b5f2c62500e095f0bbcbdc683a59f5
  1. include/
  2. src/
  3. Android.bp
  4. LICENSE
  5. MODULE_LICENSE_MIT
  6. NOTICE