Merge "Otapreopt: Accept boot image in system" am: 2b65f1c08e am: aed5afb02d
am: 42effe3348

Change-Id: I18178a7bc284472d0305a7838861e20ab001dc80