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

Change-Id: I1435b0355762ca24d41e71e3525abf35c10d12e4