releasetools: rebase ota_from_target_files on lollipop

Change-Id: I621078d676a60081b343e4894d26af077ba0d413