Merge "Consistently use either "boot" or "apex" boot image as the default."
am: 13c929e32e

Change-Id: I7582db4dab5f44334b94f8114ac929d9e8892500