Merge "vndk: workaround for building ld.config.<ver>.txt"
am: c6792c3643

Change-Id: Ibbda001c11826a3080cb5cc6deb6d32bdb5fb385