Merge "Dex header cleanup and windows simplification"