Merge "Revert "Revert "Prevent runtime module paths being used in include_dirs""" into stage-aosp-master