Merge "Fix the unstripped path if LOCAL_MODULE_PATH is set."