Fix build with java 7

Change-Id: I48b2048a0cc82df0007ca897aaa8e369bf2d8723
Merge remote-tracking branch 'upstream/jellybean' into jellybean