Rebase from 'rpm/indigo/force_rotate_recovery'
Generated RPM files for 21
Renamed RPM spec file for 21