Falcon: Quick fix for strange inherit order

Change-Id: Ib8e50e8fa53e49f92ac6a4720ca7512c2bcba0ac
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>