Merge "Update the CPU text cache sizes to be the same as their GPU equivalents" into qt-dev
am: 21a4210022

Change-Id: I9d4014fcaae97b144c88979a2c699169accb0c6b