Merge "r_submix: Fix get_next_write_timestamp and get_input_buffer_size" am: 3fe18ca38f
am: fda30476da

Change-Id: I73309c0cf35410213a1678ec0d487f768a81f731