Merge "Remove frame rate functions from buffer queue" into rvc-dev am: 62e949bcc8 am: e7515842dd am: 71820091e7 am: f4a1da4f3a

Change-Id: If294e9b665cb50fd1c9486b2d2438da7d1ddbf72