Merge "hwc2: Correct frame rate declaration."