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

Change-Id: I5aacf1bf340acb7705fc229b507deebbb3d57011