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

Change-Id: I77e37818fec163ac04f5f5ddd67c5ba4a18cbe85