Fixed ClaimBuilder and AuthenticationBuilder to return builder on chaining.

Change-Id: I831e7b10dae4f99b0ea52f6ef9f7f9bd83dbe4eb
Signed-off-by: Liem Nguyen <liem_m_nguyen@hp.com>