Merge "Clear dlerror before executing anything."
am: 25d42d5444

Change-Id: Ia94d0a07a597d7696e3c39e86fd81f163b0033e6