Merge "prowl compile fixes for google_platform."