Merge "Use efficient encoding for compact dex code item fields"