Merge "Enable mock-utils for Android build system"