Update Android.bp.
Update Android.bp.

Must have messed up on a merge conflict.

Change-Id: I7952df4f6ed2940781630ab8290b33fd4026299d

google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto