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

Change-Id: Ic89fe66b7d14f1dfaed2dfcbe57c9ba58b6d0ef6