Merge "Do not use StringPiece in ExtractJavaIdentifier" am: 20ecc6397b
am: 206ccf1f61

Change-Id: I5f53337ae154c369d748ecb1693bfc6b57b5308e