Fix extract-files for unified devices

Change-Id: I6cbe3847dbeb8a2bdfceceb0c2fc4bb19155fbdf
Merge branch "cm-11.0" into kylin