Merge "/postinstall/* does not search for a lib in /vendor or /odm" into...
Merge "/postinstall/* does not search for a lib in /vendor or /odm" into pi-dev am: be3cd3c0 -s ours
am: dabf17a7 -s ours
Change-Id: I392e3f9ed36302e095b9347a202e133365d6e00e