am 226fae4d: Merge "Cherry picking BitmapUtilTest fix." into jb-mr1.1-dev

* commit '226fae4df29b10cb6ef72a2bfaa9801f0b501c28':
  Cherry picking BitmapUtilTest fix.