Merge "Port to binder based keymaster hal"