Merge "Mark some libs as double_loadable" into pi-dev-plus-aosp