[automerger skipped] Merge "Mark some libs as double_loadable" into pi-dev-plus-aosp
am: c73c907de2  -s ours

Change-Id: I5aee223ab73536b9ff1a678ef44df43d6214ef54