Cherrypick build errors fix

related to archidroid optimizations