Merge "ART: Remove FileDescriptor knowledge"
am: 797e6d4d2a

Change-Id: I7bcb3bf43601652220015f512f4db6932e1da181