Merge "remove x attribute of java file"