Merge "ParcelFileDescriptor is movable" am: 7004211755 am: 986fd0fce4
am: 620c75e756

Change-Id: I412d03ec0d099198f5b5209612aea0e30d1a5a7f