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

Change-Id: Ie0145527feb029b09f9af7c04c17f1144270f51b