[automerger skipped] Invert IsUsingDefaultBootImageLocation to IsUsingApexBootImageLocation.
am: 07df8146bf -s ours
am skip reason: change_id Ief3ff353cc25fa81157a75d917814982f3836ed0 with SHA1 3db3d37dcd is in history

Change-Id: Ie49cdad3f60b1fa07408f892507d7597756186e5