Merge "Revert "libcore: Remove native calls in FileDescriptor <clinit>"" into rvc-dev am: c5bf4e3807 am: 67266859ad

Change-Id: Idab43a6d5536fa80697de4fa7e21732624ca0847