Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS"