Merge "ld-config: Export android.hidl.memory@1.0-impl" into oc-dev-plus-aosp am: 66f4b9bf14  -s ours
am: 09857b7baf  -s ours

Change-Id: I997e477e9ca0c32d93f8d202b2694cbd1377419a