Merge "Build protoc_extractor" am: 3f4ef2c0b7
am: d425b04681

Change-Id: I1dd53043c3d1ddb00dc62d33d7e1cbddea631c98