am 061604bd: am 0262d0f7: Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."

* commit '061604bdadd797a5371248c177e77c942c2c44f6':
  Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.