Merge "Revert "install *.so in different paths for their types""
am: 8311d46c86

Change-Id: I330c5b3014dd331dc2f7369ac635b3de2ee54aca