releasetools: Consolidate the conditions

Change-Id: Idf2288c476e0a9c299a5058cbd3268e7c670fca1
Merge remote-tracking branch 'cm/cm-11.0' into HEAD