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

Change-Id: Ib85afd4c6213381b43eb8018a03c854422ca0f98