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

Change-Id: Ibbb333af569035992022d8a433b327c8f6f977b2