Merge "Include generic for target device." am: c2685cb55a
am: 4fffc7849d

Change-Id: I40f8a576fdd139b30faaa82ab5bf30b82bf649aa
tree: 6c35255dbb5f6eff0fe11cde2cb5772673d314da
  1. bluetooth/
  2. vndk/