Merge "Fix pattern rules for $(installed_odex) for libdvm."