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

Change-Id: I0fd5f5951f2eac584b224d2a4efc6c97279fecef