Merge remote-tracking branch 'koush/mipmap' into cm-11.0
wip

Change-Id: I83fbc94ecae9a4fa5f3c2c05cd6fe231a580fff9