Merge "Switch to a thread pool for aio operations" am: dd946e87b8
am: ccf9b815fd

Change-Id: I9649a53e4b62ff7bc1968c9c00bbd37f3b0ad6da