Sheriffing/Uplift-Sim/Trunk-Aurora

Trunk as Aurora Simulation: Version bumps, enable PGO, and mozconfig changes.

In order to Simulate the change for Version Numbers etc on trunk the following files need to be changed:

browser/config/mozconfigs/linux64/debug
browser/config/mozconfigs/linux32/debug
browser/config/mozconfigs/macosx-universal/nightly
browser/config/mozconfigs/macosx64/debug
browser/config/mozconfigs/macosx64/nightly
browser/config/mozconfigs/win32/debug
 remove ac_add_options --with-branding=browser/branding/nightly

browser/config/mozconfigs/win64/nightly
browser/config/mozconfigs/win64/debug
browser/config/mozconfigs/win32/nightly
browser/config/mozconfigs/linux64/nightly
browser/config/mozconfigs/linux32/nightly
 remove ac_add_options --enable-profiling
 remove ac_add_options --with-branding=browser/branding/nightly
 add mk_add_options MOZ_PGO=1

browser/config/version.txt
 -50.0a1
 +50.0a2

browser/config/version_display.txt
 -50.0a1
 +50.0a2

browser/confvars.sh 
 remove MOZ_BRANDING_DIRECTORY=browser/branding/unofficial
 add MOZ_BRANDING_DIRECTORY=browser/branding/aurora
 remove ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central
 add ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-aurora
 remove MAR_CHANNEL_ID=firefox-mozilla-central
 add MAR_CHANNEL_ID=firefox-mozilla-aurora

config/milestone.txt
 -50.0a1
 +50.0a2

js/src/moz.build
 +# Dummy change to js/src to get SM builds
 +

 mobile/android/config/mozconfigs/android-api-15/debug
 mobile/android/config/mozconfigs/android-api-15-gradle-dependencies/nightly
 mobile/android/config/mozconfigs/android-api-15-frontend/nightly
 mobile/android/config/mozconfigs/android-api-15/l10n-nightly
 mobile/android/config/mozconfigs/android-api-15/nightly
 mobile/android/config/mozconfigs/android-x86/debug
 mobile/android/config/mozconfigs/android-x86/l10n-nightly
 mobile/android/config/mozconfigs/android-x86/nightly
  remove ac_add_options --with-branding=mobile/android/branding/nightly
  add ac_add_options --with-branding=mobile/android/branding/aurora

also in mobile/android/config/mozconfigs/android-x86/nightly you need to remove 
 ac_add_options --enable-profiling

try syntax is : try: -b do -p all -u all[Ubuntu,10.10,Windows,Android] -t all[Ubuntu,10.10,Windows,Android]