Fix idmap calls when a subdir is present.
am: 56b9987ed7

Change-Id: Ia58f447ec6bf3b63e2922b02a794f487ec9679d0