Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h" am: 8c41e791ed
am: 809dee506e

Change-Id: I937ac8e0df7bd47f3db292f7acdc11c7946af868