Merge "When compiling with the lite protobuf option, pass the option to...

Merge "When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime." into oc-mr1-dev-plus-aosp
am: 85dcb566  -s ours

Change-Id: I3526f462a3cee5b533ab13a7f85641d767279006