am 30d68a3b: (-s ours) am 817f07ae: Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE

Merge commit '30d68a3b9df5657ca0eefb063551202490a836fb'

* commit '30d68a3b9df5657ca0eefb063551202490a836fb':
  Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE