This reverts commit de3f9d5b.

Reason for revert: This CL is not the culprit behind the failures. The failures are caused due to the addition of Android.bp in aosp/2310310

Change-Id: I70a50d4e7d7b94c6fe0d7b7204f40285baa69551