Merge "Moving IS_DEBUG_DEVICE to a compile time flag for better proguard support" into tm-qpr-dev