Use '-f' rather than '|| true' trick to suppress error on nonexistant files

More straightforward, less tricky.

Change-Id: I1ff4896c88c59dc8d5b10ada427388e65d3f8535