Merge "Migrate mpq demux driver from kernel 4.4 to 4.9"