am a3faa923: am 6726d6bb: Merge "Support pre-loading browser plugins on the system image." into gingerbread

Merge commit 'a3faa923a0ac8d0d58409fcf7c99e8ff7b261ef4'

* commit 'a3faa923a0ac8d0d58409fcf7c99e8ff7b261ef4':
  Support pre-loading browser plugins on the system image.