am 8697f397: (-s ours) am f41768c5: (-s ours) am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread

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