am 8d2e2b91: am e12dad21: Merge "Generate a valid main.py for use with developer.android.com." into ics-mr1

* commit '8d2e2b91b7cb499be12dceef8f15104b4f2cc98f':
  Generate a valid main.py for use with developer.android.com.