Merge changes I3003adc8,Icad1aecd

* changes:
  Reduce upper limit of stored bitmaps to 32
  Make URI based image support optional and off by default
tree: 4715798a6dc8f1dabc2e4bc1bc487856befbf678
  1. android/