Merge "[VTS] Update allocator name for AIDL allocator." into tm-dev