We already have to have a Java and a native implementation; we don't need _two_ native implementations. Change-Id: I0201205ce5079ef9c747abc37b0c8122cf8fb136