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

Change-Id: Ic9aa76a6e77ff0a042c149c90c21e969f379bfe1