Merge "Remove tools attributes from framework XML" into mnc-dev