Merge "Allow AIDL allocator service to be used by itself" into tm-dev