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

Change-Id: I8cb4811b06405fad0c2721730a2aa1ad15187784