Merge "Fix fileslist for system other image" am: b05fe25b9f am: eb90e156e1
am: 60ff056b6f  -s ours

Change-Id: Ib69f2431a7c39247888f36b72feb7c1bec88ce4e