Merge "ahat: Target Java 1.7."
am: 9cff32df75

Change-Id: I982e0b6bd686d0327ed8c8b49c9c8d1c8b3cd45d