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

Change-Id: I97f0d2fed9cfc3f444a7deeac9a4ca13293b66b5