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

Change-Id: I69bbc553b35df6f06366a6a25794d848e82f7f71