Merge "blkid: sanity check 'end' address must be greater than or equal to 'lable' address." am: 58e29f870e
am: 1dae5eab97

Change-Id: I522cb2bf2527854bb2a866b378f98875ad544f9c