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

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