Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h"