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

Change-Id: I1fa6dad04efaba2e473c10048bc1494ab0e1337f