Merge "Do not build recovery-resource.dat if move_recovery_res_to_vendor_boot"...

Merge "Do not build recovery-resource.dat if move_recovery_res_to_vendor_boot" am: 9873891b am: 335c4b09 am: b0850bdb am: ff2ab34b

Original change: https://android-review.googlesource.com/c/platform/build/+/1467994

Change-Id: Ic9d2d0b6a82f80f96a3249ee93bfb56c6ac396c9