Merge "Update fix_permissions to not clobber the UID and GID variables. This causes issues in bash." into froyo