Merge TP1A.220120.003

Change-Id: I679783134aafce03ed6f6570b6f8d0259139a6fc
tree: 073cff76cad4a7d0cb5660f9802f2e4ea5f380a7
  1. Android.bp
  2. update-art-module-prebuilts.py