am 04df6b31: am eef4aba8: Merge "Add missing posix_memalign function in x86 libc.so.functions.txt. (See b.android.com/28834)"

* commit '04df6b31bfc70bc85ced6cd30f33c0597fae3803':
  Add missing posix_memalign function in x86 libc.so.functions.txt. (See b.android.com/28834)