Merge "Darwin: include <libgen.h> for basename(3)." am: 4b3e5e1de8
am: 167c19b556

Change-Id: Ib32f444aaaf049d1a8a36855ec09c688c0e2ccb5