Fix build by adding Java 6 API changes that were not in the earlier merge.

Change-Id: I10425b6932fc69e206da5a2cf9e120c007eec9cd
2 files changed