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

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