Merge changes I53c05800,Ic218283b

* changes:
  Leave a comment when removing a prop
  Rule for system/build.prop is also from macro