Merge "Add USE_FILESLIST_GO to switch to fileslist.go" into oc-dev
am: fe3d3490fb

Change-Id: Ib4daaa3f623d553db4935dd497269448705cfb28