tree 56fd3b42ee2d4182092d0b4926d38783a22735e4
parent 897c339438dca7bb89535d52508e76e369aa3d9f
parent d6d00b3281777cccd5ab1f3ca8f87e268a5966e9
author Dan Willemsen <dwillemsen@google.com> 1489791445 +0000
committer android-build-merger <android-build-merger@google.com> 1489791445 +0000

Merge "Revert "install *.so in different paths for their types"" am: 3250879667
am: d6d00b3281

Change-Id: Ic36dd276851c0c1a7c80e5ace5866f92b5944501