am d7fd034b: am b052e5c7: Use AOSP borders by default

* commit 'd7fd034b94240c0f3ba9588a0fd9ad0fa6dfdf25':
  Use AOSP borders by default