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

Change-Id: I2e432b9e979881e4567b9e7c61e5eca8a7ce6839