Merge "replace insecure uid spoofing code" into cm-13.0