Merge "Mark libs as double_loadable" am: 11471da1f7
am: 62bdf4d940

Change-Id: Ibf56225b34aa7dcee74f4624839962a9e82ef63d