Merge "Add more direct encode() and decode() methods." into dalvik-dev