Merge "Add app_compat flags for hidden api logging"