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

Change-Id: I656fe0a5e03f5507239d64a12529f470cce65811