Stop using [local_]include_files am: 2ee91d8a7f
am: ddebc7e4dc

* commit 'ddebc7e4dc8a21b139b5e9d63ad73f0c50cb7cb8':
  Stop using [local_]include_files

Change-Id: I9f352e460be1ce4374de9c6ff188405bce59d850