Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev