Japan to fingerprint visitors, put air marshals on flights