Merge "Don't use posix_memalign." am: 110f39b259
am: 29677c00db

Change-Id: I525a6bfe75c7e852dbf9f25327dd3e8164cceb2e