Merge "fastboot: Don't give parsing error for unsupported 'getvar erase-block-size'." am: e5ff9b988c am: 5cea27baad
am: 9cd5e53128

Change-Id: I04d086e71579811285918574d288044716098a4a