Merge "avb: Change block size to support system image"