Merge "proper mask input stream in AMR-WB routine" into qt-dev am: 688019b3b0
am: d4d0ec2a09

Change-Id: I6dc26e1308d843d6fc06b9018ff940dbdd413a74