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

Change-Id: I5220a09faaf3ea320470d93231340bc110ea6586