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

Change-Id: I8a73555fef159fa9684be37deabc3ce76952dff2