Merge "mach-msm: Manage pil_get and decoder parameters" into msm-3.0