Merge "Add aapt support for generating proguard rules for onClick methods." into jb-dev