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

Change-Id: I76c8480c0ce5583ce75a91d665862032415c54d8