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