tree 55ac449c24960e80aa3d5833861def48d750f1a0
parent 60a0e02bd9abc434441925fb503b47342c2f728e
author Joel Galenson <jgalenson@google.com> 1638223452 -0800
committer Joel Galenson <jgalenson@google.com> 1639179176 -0800

Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Manually fix patch.

Test: None
Change-Id: I1f27b464831674f7257ce46d0e5c261b702587d2