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

Change-Id: Ie8efc21417f926bc9ca8ff6a511f06beb2cd01c6