Merge "Add support for"
tree: 9bbc3cb41d0219513fe7aeb9f886df22a6eece61
  1. generic/
  2. legacy/
  3. qva/
  4. Android.mk