Merge "Fix number of arguments in otapreopt v4"
am: 7c7a04c934

Change-Id: Ib32ab1ac226392284285a8a197b9c38524f053c1