Make bitmap constants more explicit.
am: e828ea0553

Change-Id: Icd26f6034bc514746b227ac52cf8c4518c556fc1