Adds missing libs to the classpath

Change-Id: I47a4e7a552bad609348a3e21d073508012b29c81
Merge remote-tracking branch 'upstream/master'
update .classpath