Merge "hwui: Fix multiple definitions of NativeFamilyBuilder"