Merge "ld.config.txt: Move vendor vndk to vndk namespace" am: c6805c3e9c
am: 0779a259b7

Change-Id: I3cc02a497bb7e841c6a1d311c3105afe9e3aa2b0