486b198eda
Bug: 64259751 Test: clean oat files && make and flash (cherry picked from commit a023b86c3b4554b90ed6edfd63cedddb4f0100f9) Merged-In: I7c898d69e66257fe0a7827ebbab1fcff4aa6473e Change-Id: Ifb40ec51e7184984853c0d2382f040d2dea63168