Restore broken code for the Mac

Test: m -j48
Bug: 36445592
Change-Id: I50d1fbc62e057860f32838734333267419ea60ee
1 file changed