Patches against frameworks/base to add EAP support