Merge "Set idmap2 binary uid and gid after forking" into qt-dev
am: ebad9125c8

Change-Id: I13b16878cad1cb742c0b417fa09ec406e8f1bf2d