Merge "Frameworks/base: Add debug.gencfi property"