Merge "simpleperf: fix a bug setting symfs dir." am: 2da01f61fd
am: 03d1b6a4a4

Change-Id: Ie068a16061abb33a5b3d857d53f6647072727d98