Merge "Revert "Mark libs as double_loadable"" am: 1922a501bf
am: 037f039cd0

Change-Id: I54b6cb06d8a1d46042b45b9785ed4c00fe7eb96e