Merge "Compiling protobuf-c in Android Build"