Merge "Support arbitrary sampling rate in FLAC" into qt-dev am: c947f8f3dc
am: 266e56b64c

Change-Id: Ie09d6fe0620915ce6fa431eeb90a68a4fad9605b