Fix up bu restore.

Change-Id: Ib87907d1a02f891210a01dbdc1439b6a426efb19
6047

Change-Id: I76ea2c7aab15583f42486338a75c83f09036dff5
Merge branch 'cm-11.0' of github.com:CyanogenMod/android_bootable_recovery into cm-11.0

Conflicts:
	Android.mk

Change-Id: Ib2b380c5a13ba63ab646606cc5b0cd249ca9265c