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