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

* commit 'f9a9f2bba730a4f47aa84d2b97d3f52f6a73ac1f':
  Clarify --boot-image help message