Make ApiDemo build on Java 5.0

Change-Id: Ib0759e5598d73741ef9e2408f08edd5d6b38288b
11 files changed