[automerger skipped] Merge "Mark libs as double_loadable" am: 11471da1f7 am: 62bdf4d940
am: 3bbcabbb55 -s ours
am skip reason: change_id Ibbf5dede1f503e86484f805b252d4ced779445cb with SHA1 2334e00184 is in history

Change-Id: I9b45843a019a6f04d9fc4ea1e687eda0d75bc4f6