Merge "Generic rules to build ota from boot image" am: a54adf4001 am: 78cb0cef0b

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1371346

Change-Id: I346391557009c52c42f815f394fbb678e449af3c