Strings literals should be placed on the left side when checking for equality

Change-Id: I7b231138990e2a9ed6f6e9a04b537feb155b698f
Use Java 7 for gradle

Change-Id: I9c3c6d6aacfbecafbf6fe6d64db60f7cc0a6917e
Merge commit '6d58085628520e45c58255d1e8239c440a0e6b70'