Merge "Remove STOPSHOP, disable DEBUG_ANR" into qt-dev
am: 73e6028ea0

Change-Id: I35988a21120f60896cf5a4bf7c4dbb6d71d6342a