Fix AOSP build - DO NOT MERGE

Change-Id: I42b420c2ce89ce364a2809b28b827964e6923fa1
Merge "Fix AOSP build - DO NOT MERGE" into kitkat
Merge commit '58151fa0483be965b199baf1a59513fa41926a39' into kitkat

Conflicts:
	libs/hwui/TextureCache.cpp