Merge "Revert "Mark libs as double_loadable""