Merge "Allow building recovery as boot." am: 781b7b20d4
am: c27ad030b6

* commit 'c27ad030b66b8528dc145ee10ab975fa25cb0ce1':
  Allow building recovery as boot.