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

Change-Id: Icdddfc16bb2a84091494c26ed97e2e480b6bca36