Merge "Use normalize-path-list" am: c034cd5d04 am: f01f51c41f
am: 4c550887a6

Change-Id: I8d6ef704857de733cdfd380fd28271329e206d3b