am 0f33e44f: am 0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev

* commit '0f33e44fbc2e506fce71bf087a0b18b7979daaf9':
  Add Flo to device art generator.