Merge "Get optimized inv_txfm func work with HBD build"