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

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

Change-Id: Ia1cd886a5cc3878d12c79bf919e1494ae9fb514f