Support block OTA + OEM partition
Support block OTA + OEM partition

Change-Id: I9e662098569a43b05279908e6833e9552a7abe3a

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build