Merge "ART: Rerun verifier in verbose mode on boot cp failure"
am: 6ca0933871

Change-Id: Ia90ea78b88825327ea40417366d89d1b62875650