Merge "Changing some lambda to java 1.7 compatible code to allow using the lib without the system classes"