Merge "Move LOCAL_PICKUP_FILES out of $OUT/data"
am: c4b8bdc4ba

Change-Id: I0aac6741d2c92bbe46fdf89931460fbb41acc1ea
tree: b2500de9e052d7918fd546d065c30fe1cd7aeaca
  1. app/
  2. doc/
  3. include/
  4. libs/
  5. sample/
  6. tests/
  7. tools/