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

Change-Id: I74e5dbc8094716dde14aef0524e1a96b5f82b636