Update on the Chemical Composition Of Crystalline, Smectite, and Amorphous Components for Rocknest Soil and John Klein and Cumberland Mudstone Drill Fines at Gale Crater, Mars