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

Change-Id: I11bd34c1445cda4ea575fc8cff0b5577265ffa45