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