am: 2ee91d8a * commit '2ee91d8a': Stop using [local_]include_files Change-Id: I300582ad9b30497c09e1de28f2b11a1de7410153