Merge "Make x86inc support local variable array"