[automerger skipped] Merge "DO NOT MERGE"
am: 566c7ceefa  -s ours

Change-Id: I3d1f7f256b8e46fcef8dcf60af8412f04762cb17
tree: e45675d4030e3448d882e3cf77f42a7735e026ff
  1. include/
  2. src/
  3. Android.mk
  4. gen-buildcfg.sh
  5. OWNERS
  6. vnd_buildcfg.mk