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

Change-Id: I4ae77b6ba977217a21b237db86e0818fa95d66e6