Also, split internal common utils library to 1.x and 2.x. Test: VTS Bug: 69958777 Change-Id: I21244c74270a07cc350e8a2b974dafcdae02a0e8