Merge "/postinstall/* does not search for a lib in /vendor or /odm"
am: ef454589e4

Change-Id: Ic401133a7bf8c22b211a72635ef8597a2e885208