P31XX: Fix init.espresso.rc (get rid of wrong iProduct) ...

and cosmetical changes.

Change-Id: Ib2ddec3022db7389c3fb64113ce9241dde5a15a5