Merge "Revert "Revert "Prevent runtime module paths being used in...
Merge "Revert "Revert "Prevent runtime module paths being used in include_dirs""" into stage-aosp-master am: cebbe099
am: c5d10906
Change-Id: I97ba14e49fb9615b8cc3c7cc9baf7859bdbc7816