java7 compile fixes

Change-Id: Ia2727766a0491461d0c6781e7fe70f9b6efeff9a
Signed-off-by: Dennis Rassmann <showp1984@gmail.com>