Stop using [local_]include_files
am: 2ee91d8a7f

* commit '2ee91d8a7ff5683626b7d9064e3561451044b30f':
  Stop using [local_]include_files

Change-Id: I300582ad9b30497c09e1de28f2b11a1de7410153