Merge "Move platform-private symbols out of libdl.so"
am: 1701d887ac

Change-Id: I9187959913fa2e052916c0862965385c73c17336