Merge "Re-enable -Wover-aligned."
am: e9999167ac

Change-Id: I70fc7401eda75bbf13137c6e0aa931222b723294