Merge "Move librecovery_ui to a sub-directory"