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

* commit 'c5d5c3db62354a51b90934511a1f8dd1c87e987f':
  bitmapfun: Add support to use inBitmap option