Merge changes I3978cbe2,I7b8e1232

* changes:
  Reland "Prevent vendors from accessing private VNDK libs"
  Permitted and search path change