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

* commit '9d8108fe72b4783d68c08f3ce86cd7bb203063f5':
  Cherry picking BitmapUtilTest fix.