Merge "Add flags to bsdiff main to generate the Endsley format." am: aa3cb25c11 am: db3afbd069 am: 90e451a183 Change-Id: If1fd2ad6fe890fb787387e7337a74963b344b753