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

Change-Id: Ia4626f4f1df1be9b3fc403f7f45e5398fae8e269