Merge "build: sign boot.img based on BOARD_USES_RECOVERY_AS_BOOT" into nyc-mr1-dev
am: 9b9520018b

Change-Id: I66059469ee8223dcceb82a18ad3e2287ebcbb11d