Merge "Fix hwui compile error"