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

Change-Id: Ib62d37947f025920819ae80c9be505aebf6e31d7