Merge "Load legacy HAL modules from the sphal namespace" into oc-dev am: cb7791b442  -s ours
am: 50f022c06b  -s ours

Change-Id: I511785bcb77441e31b75cf7de0a8b3344738f110