Merge "Remove legacy VNDK." am: fb116ba50d
am: 2d2e821a0d

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