Revert "Improve linkage between proprietary libs"

This reverts commit 478ab3b71fff4c493efb19e4c04c862ea75ea2d6.
Merge remote-tracking branch 'upstream/jellybean' into jellybean