Merge "FP-1575: android: drivers: workaround debugfs race" into fp2-dev-v2