Merge "return -1 iff any file is updated"
am: 98ca327d36

Change-Id: I631b066b266b95cd8627217b655c2c09bba92441