Ensure Java 1.7 compatibility for pre-NYC platforms

Change-Id: I2dd3a4c4c4772aa29098bb8576a5bd22c04db5e5
4 files changed