Merge "pwd/grp: fix pwd _r reentrancy, new tests, clean up"
am: e1276ba538

Change-Id: I0f013cc1f6c0c7661559bb183dc70ab3ef346658