Merge "Stop using weak symbols in libvndksupport." am: 1d789eb210 am: fac30bf6bf

Change-Id: I793a28888f826f697e39fa1cd138eb268731e6c1