Merge commit '6726d6bb1a30167786864c445cbe0370ee0dd58c' into gingerbread-plus-aosp * commit '6726d6bb1a30167786864c445cbe0370ee0dd58c': Support pre-loading browser plugins on the system image.
Merge commit '6726d6bb1a30167786864c445cbe0370ee0dd58c' into gingerbread-plus-aosp * commit '6726d6bb1a30167786864c445cbe0370ee0dd58c': Support pre-loading browser plugins on the system image.