Merge "Mark libs as double_loadable"
am: 4ecbe76354

Change-Id: Ibd1c9a8bd0fbf70958801782f3cb9c30119b8454