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

Change-Id: I4ab91b2e8d6e104f2d350f6bdaf743f772673bfa