android containers: fix resources merge, fix ext manager