Merge "Skip calling vp9_block_energy when aq-mode is off"