Merge "Fix libandroidfw in integer sanitized builds."