Merge "Cosmetic changes in 16x16 ADST/DCT unit test"