Merge "Fix bootanimation stack overflow" am: 935d8032c8
am: 15e24878d6

Change-Id: Ia245149aaa2b6f26633600d8e525263001d70e2a