Sync with upstream:
- merge "cwm: Honor recovery variant "
- merge "cwm: Remove hardcoded paths"
- merge "Keep 'show log' on screen until user dismisses it"