Reorganize device imports and fix boot animation

Change-Id: I4cc2c5a88809eb6032f71c7d093c19e52fa1f6c4