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

Change-Id: I733a2b5b964483773ff7a0a057cbd3d2405b6b7f