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

Change-Id: I65cffef58f079c7c68690f370644a9049c821779