message: Fix bad merge that reverted more recent changes.
diff: @@ -193,6 +193,7 @@ tensorflow/lite/kernels/internal/reference/integer_ops/depthwise_conv.h \
  tensorflow/lite/kernels/internal/reference/integer_ops/fully_connected.h \
  tensorflow/lite/kernels/internal/reference/integer_ops/logistic.h \
  tensorflow/lite/kernels/internal/reference/integer_ops/l2normalization.h \
  +tensorflow/lite/kernels/internal/reference/integer_ops/mean.h \
  tensorflow/lite/kernels/internal/reference/integer_ops/mul.h \
  tensorflow/lite/kernels/internal/reference/integer_ops/pooling.h \
  tensorflow/lite/kernels/internal/reference/integer_ops/tanh.h \
  @@ -228,8 +229,11 @@ tensorflow/lite/portable_type_to_tflitetype.h \
  tensorflow/lite/schema/schema_generated.h \
  tensorflow/lite/version.h
  +# TODO(b/165940489): Figure out how to avoid including fixed point
  +# platform-specific headers.
  THIRD_PARTY_CC_HDRS := \
  third_party/gemmlowp/fixedpoint/fixedpoint.h \
  +third_party/gemmlowp/fixedpoint/fixedpoint_neon.h \
  third_party/gemmlowp/fixedpoint/fixedpoint_sse.h \
  third_party/gemmlowp/internal/detect_platform.h \
  third_party/gemmlowp/LICENSE \
  @@ -273,6 +277,8 @@ THIRD_PARTY_DOWNLOADS :=
  $(eval $(call add_third_party_download,$(GEMMLOWP_URL),$(GEMMLOWP_MD5),gemmlowp,))
  $(eval $(call add_third_party_download,$(FLATBUFFERS_URL),$(FLATBUFFERS_MD5),flatbuffers,))
  $(eval $(call add_third_party_download,$(RUY_URL),$(RUY_MD5),ruy,))
  +$(eval $(call add_third_party_download,$(PERSON_MODEL_URL),$(PERSON_MODEL_MD5),person_model_grayscale,))
  +$(eval $(call add_third_party_download,$(PERSON_MODEL_INT8_URL),$(PERSON_MODEL_INT8_MD5),person_model_int8,))
  # These target-specific makefiles should modify or replace options like
  # CXXFLAGS or LIBS to work for a specific targeted architecture. All logic
  