am 933dd8a3: Merge "Bitmapfun Sample: Update for KitKat and clean up some minor bugs." into klp-dev

* commit '933dd8a3ca38896288e2329a5612da56044e40a3':
  Bitmapfun Sample: Update for KitKat and clean up some minor bugs.