Merge "Move StringPiece to libandroidfw"