Merge changes I3e5d0cd7,I645f8164

* changes:
  External Camera HAL: Fix prefix length
  Clean up external HAL reference implementation.