Refactor recovery build options

Change-Id: Ifa10c9a936b0fe11bb99f5be73da6bf4aaa7c647
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2