Merge "Fix build fail in java 8"