Merge "remove x attribute of java file"
am: 554284edf3

Change-Id: I05553fd2ecc175858e0923e68e62305149e8dd3e