am 05d48504: am af6dd103: Merge "fix ImageView.getImageMatrix()" into jb-mr1-aah-dev

* commit '05d485044bc4607759e2b4ca5188858bceb120f8':
  fix ImageView.getImageMatrix()