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

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