touch/un-obsolete more old files

Change-Id: I90b034b298479ada59b49f8916c10e6875f58f6a