Merge "Do not read the EMMC ext_csd register from dumpstate" am: 267b36b7d0
am: e5db94bd2b

Change-Id: Idf20c3ef55fee071b1d43cc5b01a832a8172a7b9