Merge \"Clean up Class::FindStaticField().\"
am: 65ad9b3516

Change-Id: Ide965af3c183fe6f4bf1abd0c535ea2914522999