Update remaining references to /u/l/a/common-local

Change-Id: Id607bf36dc812232fca464b3d92c52c27dffc1a9