Merge "Remove prefix property from platform_compat_config module"
am: 0ed3ba7981

Change-Id: If06a3f3d35f127b4ab7de19d8c210424aca92a8b