Merge "Convert ifstream usage into fopen() to prevent fd leaks into child processes" am: 93fb6083d4 am: f1dec58b61
am: 1efcfc30b1

Change-Id: Iacc7caa16478c167462ca5645f5eabfa34381896