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

Change-Id: I325308d5af29bd5d3e48404d3d75dd2247c572a3