Merge "add libprotobuf as static include for tradefed" into oc-dev