Merge "Otapreopt: Move binary to Soong" am: 0d1ee09940 am: 608f314b87
am: fbd55c1580

Change-Id: I690ff8018b5e6b2d2ac7d999269113cff37de4ef