Merge "Dex header cleanup and windows simplification" am: b09289548f am: 1c753f37b2
am: da552d85c4

Change-Id: I6e8ce38cda7eabbc5c301e248a0e266f9467dfc5