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

Change-Id: Ic82109aeaf3bc756829870283f75ee5b2b522fea