Merge "Add more -d dalvik details to dumpsys"