Merge "Make sure R.stamp is always created"