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

Change-Id: I4236d5e443a7a08dbd69624fb8b7c045cb4d98f1