Merge "Allow update_engine to search metadata_file:dir." am: fe45425667

Change-Id: I2a1bacd9c2234233c28bf81c1140b0abdf6de12a