Merge "Add android:onClick methods to proguard.flags" into ics-mr0