Merge "ART: Refactor stack.h"