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

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

Change-Id: If81b8617953300c6af5bf6d5adb9f97e96212a5e