Fix automotive.* hals for oc-dev am: ce3aab7bd0
am: 2e1e33169f

Change-Id: Id80370ccdb6396cd089f2123832ca7f151dd6242