Merge "Add a way to customize boot animation during userspace reboot"
am: 3d0bb1d650

Change-Id: I06942b4dcd8acdc70e171b814d8c10f8eafe3c50