Merge "Cherrypick a change to drop getcwd prototypes." am: 4367cc55b9 am: 5245bb626d
am: b93e4be44a

Change-Id: Ib65aece88d556e10d16a8aa4ff4fe86d8c7c27f4