Merge "Fix TextureView.getBitmap with scale layer transform" into pi-dev am: f5d4ea6132
am: 0678660c8d

Change-Id: Iade1ef3e2fd05cc7e127d224d310ef86441a09d7