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

Change-Id: I932a8e3cb026c159024017861042da2ef49d4302