Merge "Revert "HAL interface libs for testing are now built as test lib"" into oc-mr1-dev am: 1f87d477ee
am: 38b892522c

Change-Id: I3d9a3ce8123fea03c5d518e303434b204cbec66a