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

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

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