Merge "Unmap shared memory when no longer used" into pi-dev
am: e70022cfd9

Change-Id: Ib30bab78226f747e62364f1734c41d84a49643fd