Merge "Moved libdumpstate.default back to Android.mk"