Merge "Use LOCAL_PROTOC_OPTIMIZE_TYPE to set the protoc flags correctly instead of adding the library by hand." into oc-mr1-dev-plus-aosp
am: 470295ec0c  -s ours

Change-Id: I09efcb0afcb7d55b4cc51c215f3c263215fe7d51