Merge "ART: Refactor stack.h" am: 89af4771a6 am: 06f1b0f955
am: be38419e56

Change-Id: I704caaa3bd225de3333ffb6fb9250ae5ba8963af