am 1747e35a: am a0021026: Merge "fix up ota_from_target_files symlink detection."

* commit '1747e35a090cff66b117128c7bffd2e8b5050f37':
  fix up ota_from_target_files symlink detection.