Merge "Merge "Ensure memory ordering around libagl and EGL refcount operations" into nyc-dev am: bac438bbb6 am: dca51004bb" into nyc-mr1-dev-plus-aosp