Merge "HAL interface libs for testing are now built as test lib" into oc-mr1-dev
am: b0977150b0

Change-Id: Ia844b23838a29b2da0b4278f252c7941fa83ca65