Merge \"Add arena stack and priority queue type aliases\"
am: ea159431cd

Change-Id: Ia4db08fe011ee7e1eaadc8f0f221f71f146dbdfb