* This reverts commits7ef0e170and4ed4605and removes relevant flags to prepare for using Soong config variables as per Google's docs Change-Id: Ib6ae5a8a922104d37f8d0e08242b428eb129785c
* This reverts commits7ef0e170and4ed4605and removes relevant flags to prepare for using Soong config variables as per Google's docs Change-Id: Ib6ae5a8a922104d37f8d0e08242b428eb129785c