Merge "ld-config: Add HIDL memory libs to VNDK-SP" into oc-dev-plus-aosp am: e3ae43e897  -s ours
am: 43a1a3adef  -s ours

Change-Id: Ida49dd9451c3960247050270e363064d9f2d171d