Merge "Allow custom fonts in the boot animaiton zip file" into cw-f-dev am: 515b70073a
am: 2b949b42a4

Change-Id: I378c7395d771bf7b4f6d9f06beef8b4d6c901f63