Merge "android/utils/: Proper C++ inclusion guards."