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

Change-Id: I72220db5f31bc3e7ba5ddc128731b724e7f55cb1