Initial changes for ParanoidAndroid