am 2aac0a0a: am d2de640e: am c5d5c3db: Merge "bitmapfun: Add support to use inBitmap option" into jb-mr1-dev

* commit '2aac0a0a9d16fa494de17b64985517fc73836ca4':
  bitmapfun: Add support to use inBitmap option