Merge "Convert RecoverySystemService to use AIDL BootControl HAL"