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

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