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

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