Merge "Mark some libs as double_loadable" am: 8d36f179ee
am: 6d186b20aa

Change-Id: I4a362265582d0b15729a472b6e2292100e0a5cf7