Merge "Support ETC1 compressed texture"
am: 4922ae34c3

Change-Id: I8efda0ce90b5574e8a4a648fdbb3063a5512e4f3