Merge changes I5fc0f53f,If810fe10,Ie3f03d96,I59c1c4fc

* changes:
  android-constants.c: Move constants to single file.
  main-common.h: Add reassign_string().
  android/: Add proper C++ inclusion guards.
  android/avd: Add proper C++ inclusion guards.