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

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