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

Change-Id: I21b8bd658b93e2bd5a7036733cedda5e3852d18f