Merge "Increase EP_ALLOC ioctl number." am: c21b625d06
am: eb93f3b468

Change-Id: I4d15d90231c969495d4a7ab0e45e61d9e13e4465