Merge "Remove (now) unnecessary reference to core-lambda-stubs." am: 68e91852c3 am: c1d97c9250 am: 5e7dd0999e
am: c4108d2f24

Change-Id: Idcf4f8c41c1b83cd6d668ed6d9bc7d1d0c4e567a