Merge "Use --add_missing in merge_target_files.py" am: cc875c1482 am: 6c3aa71d1b am: 0621e17353
am: f149e7190a

Change-Id: I311c9b9944e9cfda6061e1ea0a8cfb9d27023d1a