am 6f50cbc9: Regenerate files and re-add android changes.

* commit '6f50cbc975f782b7576ed699a7c2b123655d1b95':
  Regenerate files and re-add android changes.