[automerger skipped] Fix TextureView.getBitmap with scale layer transform am: 421449a4a6  -s ours am: 3c3beb6e3c  -s ours
am: d13d18487b  -s ours

Change-Id: I7c24f84df6f70c4b2588a73ba29043aa26d37f0d