Merge branch 'cm-11.0' of github.com:CyanogenMod/android_build into cm-11.0

(cherry picked from commit f9585cf9a52c5e3de59b68e112b0caa17f2538d6)
releasetools: use variable instead of fixed name for bootable image

When building for a device with a custom bootimage makefile, this
would cause the boot image to be used as the recovery image during
fastboot zip creation.

Change-Id: I075cfe4e9a2a8384d3767de351ec7f751f3e95ab
(cherry picked from commit 0e6d660d1abc51cc73b87bba67a8038b22998f0b)