Merge "Set search path to ro.vndk.version property"
am: 8ab16c5da6

Change-Id: I7bfc2c26e056e874c4e5549fedc4402da66a0db4