Android m preview 1
Merge "fix up ota_from_target_files symlink detection."