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

Change-Id: I575ef1a45746c14b5c01301d8336307f2575a4ba