am aa771ceb: am 71282a47: Merge "Fix access modifiers on ImageView overrides" into ics-mr1

* commit 'aa771ceb0919f2a66ba9c927e5617d15471d70e2':
  Fix access modifiers on ImageView overrides