Merge "Make sure R.stamp is always created" am: 47e46f7725
am: 3d7584d9c3

* commit '3d7584d9c3b619619eaf10a0110f28f4f802f2cb':
  Make sure R.stamp is always created