Merge "otapreopt: use boot image from ART APEX" am: 150abca0ab am: 5e312b6457

Change-Id: If151261d09ddbff5fa87245c7bc12c1b9d64fb4e