Merge "identity: regenerate makefiles"
am: b90d0a684b

Change-Id: I105b14ea286ae94fcbb35658c99d0da852850f70