Merge "Error on external includes"
am: 4b33f51043

* commit '4b33f510436f88774f5217b472835973fd8d5b2b':
  Error on external includes

Change-Id: Ib2fb1470cee531cb043e7fe4a8e310fb026dcb3c