Merge "Removing LOCAL_COPY_HEADERS so LOCAL_EXPORT_C_INCLUDE_DIRS is used, as per VNDK" am: 7ed6a1b958 am: 8a9eb754fc
am: 2c108e8775

Change-Id: I2be13cbee93b5d72df14c25914478fcdb18c0a20