Merge "Clarify --boot-image help message" am: f9a9f2bba7
am: 53b93389d1

* commit '53b93389d189f39ce33b82c01f5cc527d591b507':
  Clarify --boot-image help message