Merge "Build `recovery` with Soong." am: df264e0186
am: 24b16491db

Change-Id: I5708d582aa745e398a165e589ad3df192d1b6c84