Merge "Revert "Mark libhardware_legacy as double_loadable"" am: 0f90ed1ffc
am: 1a0ad92fd9

Change-Id: Ic9218d86f5963043e08fa8ab8d87be8601304e58