Merge "vndk-def: Support same-process HAL discovery." am: 23bfda4832 am: 17094eaee0 am: 1d795b78b2
am: 8fe390f39e

Change-Id: Ic14379f8c262b5bb2e49364803bb246c4ed22abe