Merge "Enable thread analysis on template functions." into dalvik-dev