Merge "Make aligned_alloc match the standard." am: b8ef55a4f8
am: 4917f6f575

Change-Id: Icb72489b2fc61706934b85d6e8a03b01c1033d43