Merge "Add USE_FILESLIST_GO to switch to fileslist.go" am: d625ef2894 am: 0a069a74c2
am: 6a05fb3d33

Change-Id: I9d49341e4e9145151a728160944276b43f83d76e