Merge commit '3f204e86d4a4449fa6196ba26e668d345e24bfb1' into eclair-plus-aosp * commit '3f204e86d4a4449fa6196ba26e668d345e24bfb1': QSD8K supports 8x scaling