Merge "codec2: handle multiple maps in linear block" into pi-dev
am: 2340922701

Change-Id: I5939e279128520a159f147eebe799eb15dc53c17