Add missing tablet resources; get compose working correctly/ cleanly.

Change-Id: I484a1880009e557fc660d56cda83313efc13825a
61 files changed