Re-order variables to align more closely to the OE style-guide. (From OE-Core rev: 5c9c61250bb23fd5fd1c18e243cab0d80573b749) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>