Merge "install *.so in different paths for their types" am: 55b14bdaa4
am: a2b86b14a5

Change-Id: I5aa05455a223fe41bcdfdc5daa2ba7f64b693003