extract: fix typo, add missing devices

Change-Id: Ic395e8f61bd4e7bade08254e8f200c69e0cfde04
Merge remote-tracking branch 'refs/remotes/cm/cm-10.1' into jb-4.2

Signed-off-by: travp624 <travp624@gmail.com>