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

Change-Id: Ieb5619a31e623e6e3c3a08bde61029e468c8573a