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

Change-Id: Iad40d95ad5381c5dbcf6c7c71159e86219588b28