Merge "Update the version number in Android.mk"