Revert "Add  ro.com.google.clientidbase to init_d2lte"

This reverts commit ea8ebd47a56769f04a2a83e5c4743af8ae4a038c.

Change-Id: I41ca0fe09703c1023fd8648e1e46cd2fffae686f
Merge branch 'cm-11.0' into kk_mkt