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

Change-Id: I88b2c5889c1ddb35728629615c75bf6e8646420e