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

Change-Id: Id1818c5e01f5eb0c4a5b0ce6fce05ecee9cdc4dc