Merge "Get rid of old ParcelFileDescriptor API." into honeycomb