Merge "Revert "Add Android Runtime APEX lib directories to the system linker configuration."" am: c400ced93d
am: 1e08eabf7c

Change-Id: I7ef397d90fbebaa8a29829c2863ff0b52c66dea8