fix conflicts
Fixed a little typo that wound up un-pushed.

Change-Id: I807004aaa9d69ad40e634cd20ad4b5a26c740e97
Make ActivityStack hacks more conservative with their mutual exclusion, as was before.

Change-Id: I30bc63337087e198701d3f89e44e80bb22e30f1e