Include Atmosphere fix for Android 4.1 (#12101)

Change-Id: Ia17a9d8c6ece9861476be8861a735fe5d3e054bf