Add keystone management for Android