am f5db9725: am 4ecedbc8: am feb3ecaf: Merge "Fix name for NDK protobuf libraries."
am f5db9725: am 4ecedbc8: am feb3ecaf: Merge "Fix name for NDK protobuf libraries."

* commit 'f5db972506970b566081a5f0c269f39bdcda9772':
  Fix name for NDK protobuf libraries.

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