Make core-common jdk6 compatible.

Change-Id: Ia802dc85164d10b877f28a42215d62d4161992c2
Signed-off-by: Michal Gajdos <michal.gajdos@oracle.com>