Merge "Support pre-loading browser plugins on the system image." into gingerbread