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

Change-Id: I866f288d938b49d34ee9795b944d91e1be2067b7