Merge "Re-enable vril-dump for adb bugreport." into ics-mr1