[automerger skipped] Merge "r_submix: Fix get_next_write_timestamp and get_input_buffer_size" am: 3fe18ca38f am: fda30476da
am: a27f141e33 -s ours
am skip reason: change_id I322bf8cf42415fddb028c9cd10db0ac82089ce85 with SHA1 739ce6bbad is in history

Change-Id: I7e7d1c55802db9ecba2827939b53e96d9f83051b