Merge \"Support trimmed images in BootAnimation\" into nyc-mr1-dev
am: 656b9db5fb

Change-Id: Ida34d52d7761c1d08028121cffba12723caf8c00