Merge "New tool merge two dex files into one." into dalvik-dev