Merge "Clarify 'fastboot flash' help."
am: f90137da60

Change-Id: I092853ae3789730989125b09707958da1a6fd2c7