Merge "Add stat(1) symlink."
am: 3ed427853d

Change-Id: I672978002c04037b3792deafad6ada52dac03311