Merge "Make Mtp FFS allocations per session rather than per file" am: 3f6419d0e5 am: 57b71e605e am: 8a91cf1510
am: 29e24f2256

Change-Id: Ia166c9d64c3692530fd37d38605d9bd83094fc5d