Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_build into cm-11.0
"fix" format command in updater-script

Change-Id: Ibc9101b82f749fba2b19eeac305d3239132c71c1