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

Change-Id: Ifde44b813aa2b2109dc38004a7db59c7dad85912