Fix unnecessarily non-static inner class to static inner

Change-Id: I0c8efda6ef0bede6b5871cd651f42db82dbfbd39
1 file changed