Merge "Mark libs as double_loadable"
am: 11471da1f7

Change-Id: I4fd8878f0b2eb4bc22be5020d3d0ca795d53da88