remove unused BOARD_USES_COMBINED_RECOVERY

Change-Id: I79520c510488d63d469b0d1a3a099420f7de1fe6
Remove the line that deletes *.rc from the recovery ramdisk.
This is no longer necessary since recovery init.rc only includes "import /init.recovery.${ro.hardware}.rc".

Fix up the unpackbootimg target.

Change-Id: I30b515bda982fbd944fffbc64501588cd3702dd8
fix build

Change-Id: Iedf209517bbdd65449077eb7c2997e28f2f2853c
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1