am 30dc8d1e: Merge change I61343808 into eclair-mr2

Merge commit '30dc8d1eeb318ea374a5f03fa91ea5089c3dc8ea' into eclair-mr2-plus-aosp

* commit '30dc8d1eeb318ea374a5f03fa91ea5089c3dc8ea':
  Remove external/protobuf from the build, now that it's