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

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