Merge "Fix hwui compile error only seen with debug switch."