Merge commit '972fb8879c46f774daec656b3b1c1f070f04ee3e' * commit '972fb8879c46f774daec656b3b1c1f070f04ee3e': Change the constant name identifying the NV21 Adreno format.