Merge "Build and use ota_from_target_files as a module." am: b7957f112b am: 93d52312d3 am: b235e8ded4
am: a602db0c99

Change-Id: I46b51ec02cd01e1fb93977fac824abe21dbdc246