Bug: 64259751 Test: clean oat files && make and flash Change-Id: I7c898d69e66257fe0a7827ebbab1fcff4aa6473e