grouper/tilapia: Update inheritance order

Change-Id: I105a1d06df3dbe510ec0bb0ba9536835064e1d21