Update to extract-files from offical CM build

Change-Id: I2b51d22a248b476578722163c2d1e2676b93164b