Merge "For msm8996, replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK" am: 38a69131 am: 2ec3705a Change-Id: I9b3f4d5054f929aec9ae68756475130757037f8a