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

Change-Id: Ic4c9393a46a32040a97a4036e7a51e2a6916db0b