Second rearranging of source for Android version