Merge "dalvik: don't build unit tests on eng builds"