Merge "identity: regenerate makefiles" am: b90d0a684b am: 00b1d20208

Change-Id: Id91f445cab5e53c1d59693a11fdab10102806a48