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

Change-Id: Icd7886942148b7eae17f56f6c5009ff7fba8bc77