Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread