ART: Allow to change boot image pickup order am: 8682354d44
am: 05a06f737e

Change-Id: I26cacbc897c3718da2fda6de5aabe69aeb63a2fa