Merge "Error on external includes" am: 4b33f51043 am: d983b78a6f
am: b25374cfe1

* commit 'b25374cfe14fb8d26be5d7b5efad419ec94535e8':
  Error on external includes

Change-Id: I4f16b628f88d47083df6bee05e04cc21a6d0701d