Merge "Fix: linker segfault on dlopen of a DF_1_GLOBAL so" am: 619df557 am: 6fb2aa81 am: 26bc3c58 am: 9f826e04 Change-Id: I678a235402c32c32a307a459bcaf7c08120d6bbd