bug 847351 add support for manifest inclusion to on-device manifests r=jhford