Update configuration for better secure ADB/root support

Includes workaround to prevent kernel hang when restarting ADB
daemon via "adb root".

Note: secure ADB & root not enabled yet - let's wait until things
      settle on this branch.

Change-Id: I296010b2068970dc27617615020dc167bb76c044