Merge "Remove Soong intermediates after renaming core variant"
am: 55406a8458

Change-Id: Id9c7dccadeab083a5da852b7482d3f5f5525aafb