Merge "Revert "For msm8996, replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK"" am: f86d09c1 am: 63abe022 Change-Id: I6af1f96b1ea509cbe96bd90f1089e35ec67dcfb9