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

Change-Id: I0a0ce932a75dc4bb5921deaf90cffca9d3a31821