Merge "Include generic for target device."
tree: d50d61e7ea67738b2e9fa203b94848e8f0da9989
  1. bluetooth/
  2. vndk/