Merge "releasetools: merge_target_files.py should handle new contents of...
Merge "releasetools: merge_target_files.py should handle new contents of dynamic_partitions_info.txt" am: 1567472f
am: 338f16c2
Change-Id: I120884c2058d4095c8d462c494e0b7e4d8c8edae