Merge "test: Fix 636-wrong-static-access for javac/dx" am: 2ffec908eb
am: 9ad1c3879e

Change-Id: I1bdee37b54e3745b2ff1462ed8138f2bebe1d478