Merge "Use enum for read barrier options in compiler"
am: 48dfb4a7f1

Change-Id: I0d1e400a0603aef56afe104ac38dbddac2370ef8