Merge "Use "-z muldefs" to work around duplicate symbol issues."