Merge "Add flag to disable super optimization" am: 90fc835d48 am: d61ce22b08 am: 79217e1af2

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2633939

Change-Id: I849958d9e9de3be48e32f57acc7b3526e184482c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>