base: properly check that quickboot is enabled

Change-Id: I0c9e54ee2cdf4efb5097cd101a0fa274f493d816
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge "base: properly check that quickboot is enabled" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0