Merge "Hwui: Remove unused variables" into mnc-dev-plus-aosp