Merge "Fix linux 64 build" into gingerbread