Merge "Revert "Replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK"" am: a19e87fe am: 6d355e61 Change-Id: Ieff87139db8c4bef748b7caee406b94278e47d07