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