Merge "Move librecovery_ui to a sub-directory" am: 6287253eb4 am: 45898d8bb4
am: be1485faec

Change-Id: I7b02a0c6081086b7765bfecd9f53a207bd93f75d