Switch branches to match vendor build in flame-KK

Change-Id: I74982fb71e1699d617a7382b0a6da8fb7ba39f8e