Merge branch 'android-4.14-eas-integration' into experimental-android-4.14

Refactored EAS patches on top of 4.14 base

Change-Id: I13a68ddad54ad49c7fec77ad6dec1ec5325aae27