Convert java tests to NewTestArchContext
am: 4c428dfb28

Change-Id: I51ffc977a2b5ce08d36aa44efc3ef7db46c6112a