android/avd: Add proper C++ inclusion guards.

Change-Id: I59c1c4fc4559967b8f9a5fa0f56dfda62684a0a7
2 files changed