Merge "Use pixel format from buffer to determine opacity." am: f667bfa451 am: e3eb4df3e9

Change-Id: I5031e1bd77b2ce54fee8a8e5f4cd66454a70c865