Merge "updater: Remove some obsoleted functions for file-based OTA." am: 342717d148
am: 000f364c19

Change-Id: If8fc89d7a6e6111bb3ed51f888fa5303914aebd8