Merge "Add aligned_alloc to libc." am: dd1742aca5
am: 9e0a5075a0

Change-Id: I1e08df3f6f6e812d71fbabd6f5a608171dbf88f6