Reland "Fix sensitive logging""

This reverts commit 338bd1adbe7320ed1605ed4c7249362f16be258d and fixes broken BuildPath() 'always' appending a '/' to the end of a segment, e.g /sdcard/foo/ (even when foo is a file)

Reason for revert: Fix forward with ag/10380778 enabled to catch regression

Change-Id: I86af9c7b4e173505140e58df4744fa94e0ded001
3 files changed