Merge "add pathmod to envsetup.sh for making finding paths to modules easier"
am: 9d1aab10f3

Change-Id: Ie8c1c36d965af9d09491d5043d3aaa5d7da65e23