am dc5249ab: am 717de0f5: Merge "Fix installing 2nd arch shared libraries"

* commit 'dc5249ab3c82040e21269fb69dc9a6dc89224629':
  Fix installing 2nd arch shared libraries