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

Change-Id: I52132adaff50c0a7df0dbc1a462c0288653b8d80