Merge "Mark media.bufferpool2 and media.c2 as double-loadable"