Ignore HasAlphaLayer flag to fix b/30929229
am: 83427ff222

Change-Id: Ibed96126da1489753744d28f439796ee76e2e163