am 52706c6c: am 4a745e78: Merge "Change the dither texture\'s swizzling" into jb-mr2-dev

* commit '52706c6cc0d8ded20cfa8d46f200ca38f1009468':
  Change the dither texture's swizzling