Merge "Remove sys/class/leds from dumpstate." am: 28b48f29d5 am: a9a6aa3637
am: a02f40c4b0

Change-Id: I1e97a00ead1c9824a74a6ae077a23890d356e264