Android 8.1.0 release 42
Snap for 4657601 from a001fcbfab0cab392f6d3a311cec27324d3dac6e to oc-m4-release

Change-Id: I59a28a4c29bfb5d4b048ec2bbf85914202bd0222