am c5378645: am e8518e7e: am f8fdf87c: Merge "Fix handling of android:onClick for ContextWrapper" into mnc-dev

* commit 'c537864580bbb3e272f9e227eba52523c6323731':
  Fix handling of android:onClick for ContextWrapper