Merge "Support loading /odm/manifest_${ro.product.model}.xml"