de109167a2
Fix: 321724947 Flag: NA Test: both soong and gradle builds work Change-Id: Ifc29aa62f19b16da668ed8129cd2a408c65e52f0