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

Change-Id: I445eed15dc0a7bded7cb44ced2ffddd8a3935a38