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

Change-Id: I9d5d3188dfba10e5b27121c4f24983d7377e0afd