Bug 1329: Use original definition for searching for java class.

Change-Id: I667c5370e45353626c65099c57876b2f8c60ab91
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Merge "Bug 1329: Use original definition for searching for java class."