Merge "Mark libs as double_loadable" am: 4ecbe76354
am: 354e176021

Change-Id: I89513dd08d17bf42af814add3586ef21b3c9141a