Merge "Revert code formatting of OD_UNIFORM_CDFS_Q15." into nextgenv2