Revert^2 "Fix the check on apex-versions for boot images." 57b3b54b023e5054f5356c09f929279f50a65b4d Change-Id: If2469c3a1d2c90409bbfa946d2c72a981b0e68eb