Merge "Removing LOCAL_COPY_HEADERS so LOCAL_EXPORT_C_INCLUDE_DIRS is used, as per VNDK"