am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread

* commit 'f7b99b32ad7a4872376355acabb5984142ba5e75':
  Give system server permission to access USB. DO NOT MERGE