Merge "Revert "Mark libs as double_loadable""
am: 1922a501bf

Change-Id: I9c5a3d811cbdb45a3d6bc7c4524e3d20a6959191