am 116f905d: am 72deed8c: Merge "Fix validation of system paths in installd."

* commit '116f905da9f01cf68fc3456a871f1e3405bf15d0':
  Fix validation of system paths in installd.