am 1f637158: Merge "Use platform protobuf unless building with NDK."
am 1f637158: Merge "Use platform protobuf unless building with NDK."

* commit '1f6371583ef6ce3a384262ebb291515f5ca3a7b6':
  Use platform protobuf unless building with NDK.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build