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

Change-Id: I31ef7306e369e9f79329176e33c8a448ae1fe58f