Merge commit '8634c6cf602efae71326fa7b3910d9034378287a' * commit '8634c6cf602efae71326fa7b3910d9034378287a': fastboot, mkbootimg: support alternate base addresses