Fix WhiteSpaces and edit cross compile

Change-Id: I5089dc631fbd4a9d973f9367edce8446b326b564