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

Change-Id: I7aa06e75dfe7fd8b7bb29830ea46ebcbe96b536a