releasetools: Consolidate the conditions

Change-Id: Idf2288c476e0a9c299a5058cbd3268e7c670fca1
Merge remote-tracking branch 'upstream/cm-11.0' into berserk
Merge branch 'berserk' of github.com:berserkaosp/android_device_motorola_moto_msm8960 into berserk