Merge "Clarify --boot-image help message"