Update makefiles to match extract-files.sh

Change-Id: I357b3476a6794ceef6f05c0f3b99ffd8ad5c042c
omap4-common: fix ifdef

Change-Id: I7bfc9420e7dbc64005d1f74a20fa79e4cffef7ff
update maserati bins from 4.1.2/9.8.2O-72_VZW-18

Change-Id: I6a2ff52e8d54eafcfe235d921d85341691f053de
Merge remote-tracking branch 'omap4/cm-10.1' into cm-10.1