Merge "Use normalize-path-list"
am: c034cd5d04

Change-Id: I9d70f63c39a561b31c8061594a31ec449817ecc9