Merge "Make ApiDemo build on Java 5.0"