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