Change build reorder

Signed-off-by: Willy Sudiarto Raharjo <willysr@gmail.com>