[automerger skipped] Mark some libs as double_loadable
am: e3f35e348f  -s ours

Change-Id: Ic142635ff1abd49cba8ea8ea2b316b0f7fd6edca