layers: MR89, Fix gtests for android

Conflicts:
	layers/draw_state.cpp
	layers/image.cpp
	layers/mem_tracker.cpp
12 files changed