Merge "Otapreopt: Move binary to Soong"
am: 0d1ee09940

Change-Id: Ia6b1a6c328253bbb3e512a0f60af3c99cdcae221