Merge "Remove legacy VNDK."
am: fb116ba50d

Change-Id: Ic8710f6134a38b346717c5ff28ac63032346981e
tree: 91044a36c8de378ec60f8483b94c4fffc332a436
  1. bluetooth/
  2. nfc/