Merge changes from topic 'skia'
am: 061a21df00

Change-Id: I5834a9f62b956b6abc9fee038051c9bae6813096