Update CREDITS

* Fixing change I94131a69 according Matma Rex comments.
* Adding contributors with 4 changes merged.

Change-Id: I9a5190e244bd8f584dfc35963d46651b9c37e92d
Merge "Update CREDITS"